Merge from emacs-24; up to r108129
authorGlenn Morris <rgm@gnu.org>
Wed, 5 Sep 2012 07:05:56 +0000 (00:05 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 5 Sep 2012 07:05:56 +0000 (00:05 -0700)
commita5e42a8239cad51b5593d661e4c518cf231a408f
tree89e3abf9e0614a4e44f96c9076e2e5e81ba34059
parent7c154a345ec694ed151d56b6cec944d88605b0c2
parent4ba43319c928a76f9c8790ff357dccf00dfd3a46
Merge from emacs-24; up to r108129
lisp/ChangeLog
lisp/calendar/holidays.el
lisp/emulation/cua-rect.el
lisp/play/blackbox.el
lisp/progmodes/flymake.el
lisp/progmodes/sh-script.el
lisp/textmodes/picture.el